Fix a small leak

diff --git a/ChangeLog b/ChangeLog
index 9789a98844ab2eab869dc6d6ec546e748faab866..2c43ab31e2ddf0aaf93f4aa071fa9e839f49fdc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't
+       leak an empty list.  (#346970, Chris Wilson)
+
 2006-07-08  Behdad Esfahbod  <behdad@gnome.org>
 
        * gdk/gdkpango.c (layout_iter_get_line_clip_region),

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9789a98844ab2eab869dc6d6ec546e748faab866..2c43ab31e2ddf0aaf93f4aa071fa9e839f49fdc7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-07-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't
+       leak an empty list.  (#346970, Chris Wilson)
+
 2006-07-08  Behdad Esfahbod  <behdad@gnome.org>
 
        * gdk/gdkpango.c (layout_iter_get_line_clip_region),

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index da5694bf42e724b3845575aa911812e90bfb4177..38e1ab8bf57c64b5769d98214ccb786457e91271 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -2141,7 +2141,7 @@ update_label_and_image (GtkFileChooserButton *button)
   gchar *label_text;
   GSList *paths;
 
-  paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (button->priv->dialog));
+  paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
   label_text = NULL;
   pixbuf = NULL;
 
@@ -2185,10 +2185,9 @@ update_label_and_image (GtkFileChooserButton *button)
                                  GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_ICON,
                                  update_label_get_info_cb,
                                  g_object_ref (button));
-
-     out:
-      gtk_file_paths_free (paths);
     }
+out:
+  gtk_file_paths_free (paths);
 
   if (label_text)
     {